Updated for user_data change