Added group scaffolding and json support