Adjusting to new schema design