Preparing for new schema system