added possibility to create groups