Changes for schema-awareness