Added cheages related to user factory and trait