More TODOs for integrating the new schema