Added support for users through scaffold