Use natural keys in initial_data