Improved user/group models/mappers. refs #116