add user module and adjusts in others.