Added propper listing for users and groups.