Fix architecture with services