More work on Leaf-Table Inheritance