Service layer added and partial application is working as expected