Started to add support for groups