Moved services to singleton scope.