More inheritance schema changes