Update to allow support for custom users.