Fix it for new schema