Modified User to be a normal module