Made changes for new schema