add SolariumService, refactoring