Fix inheritance in schema