* Minor Schema Improvements