User module changes