user_data: handle modification better