Basic object group support added. some comments too