Map works with new schema