more schema work for #103