Update to schema mapping with v1.1 merged in