Added group editing