Started implementing new schema.