Factor out some common objects in the schemas (#98)

Co-authored-by: Eric Boucher <[email protected]>

Author: laurentS