added fixes for v1.0 schema