Move user and group functions to higher class