Move service to application class