removed extra_data override