Some schema optimizations