Issue_41: more fields to collect user info