Updated with query for user verification