Add update User and Group, some refactoring of classes