Added expiry_date to user_find result