Add support for users and groups