Modify model and service functions