Issue #153 - Updates for Schema 1.1 - bug fixes + better labels