Add more logic to the service layer