Added group schema - #20