- service classes were changed to be non static