Optimized Group instantiation and added more logic compression