Got rid of unneeded inner-class
Added Group Attributes