Add preliminary support for Groups (this is a work in progress)