1. Fixed Schema bugs.