#659 - Split the admin and non admin services