adding support for group
continue as much as possible