add user class.
Revert "add user class."

This reverts commit 2219f2810eb37cfe442d0ce7dc2ddba0ea933359.
Merge origin/master
add user class.