Introducing service layer to generator bundle