Add set of inherited attributes/methods to respective tables
Remove some unnecessary code
Add extension class method wrapper stage