Bit lost as to how the schema enters into it, but...

Change-Id: I76967c564a64ff3589fb3a8fedab06c2dbb1b894