Changed to service to singleton