3.18: Update schema to be objects