Aligned to updated template. Added generic_service.pp