Added consolidated schema for v1.0.2