Updated logic for list serving.