Improvements of user modul