Layers refactored as Service