Update schema to v2.0