Redo the service registrar for better OOP patterns