- Fixed nesting issue for Schema.