Added sorting to service container