Major additions and changes to Users module