Updated user module