Big update to integrate the User module more into the system