Added group commands

Change-Id: I58ed4bfd438e73ed3972fb3274dded86bc7cb724