Work on the revamped user module