- Service is refactored a bit)