Ethernet passive optical networks (EPONs) have emerged as the one of the most promising candidates for next-generation access networks. These new architectures couple low-cost optics with advanced edge electronics to offer vastly improved scalability over competing digital subscriber line and cable modem offerings. This paper proposes several novel architectural enhancements for EPON, which will help increase the viability of optical access over a broader range of subscriber access scenarios. Specifically, this paper proposes a two-stage EPON architecture that allows more end-users to share an optical line terminal link, and enables longer access reach/distances (beyond the usual 25 km distance). In addition, a new dynamic bandwidth allocation (DBA) algorithm is proposed to effectively allocate bandwidths between end users. This DBA algorithm can support differentiated services in a network with heterogeneous traffic. We conduct detailed simulation experiments to study the performance and validate the effectiveness of the proposed architecture and algorithms.