Moved services classes to parameters