Reworked service layer