Change struc and add new service layer