Support creation of groups
Group bug fix
minor bug fix
Minor bug fix