service request model refactor