Improve 2.0 schema