Improved UserModule