Added few more fields to build the User entity