Added groups
Bug fixes