To enhance the upstream data traffic management in an EPON, a scheme is employed to allocate transmission windows for upstream data transmitted from the subscribers' ONUs to an OLT. The queues of a logical link are grouped into queue containers, and the OLT allocates upstream transmission windows to the queue containers. Logical links assigns the upstream transmission window allocated to a queue container to the queues in the queue containers.