Splitting out the services