Less .with() and more constructor (so we'll get compile errors on xsd changes)