Changes to reflect new schema