Mapping of new schema