Moved scaffolding to the services for easier switch out with API