[MOD] Added new fileds in User and all related classes
Revert "[MOD] Added new fileds in User and all related classes"

This reverts commit 6830cfb9b0349fb062ca68b9a562a353cb3b7d9f.
Revert "Revert "[MOD] Added new fileds in User and all related classes""

This reverts commit 1e8da52dce5ced7db0d243263ab939475bc469b5.