Change usage of service layer