Added user and group management