Add support for setting the descryption and group support
cleanup some of the missing parts