improve user and accesstoken model