More new schema work