[Feature] - for new schema