Schema includes fix