Refactor group commands in GroupCommand object