Add propper support for the users module