Add inheritance/polymorphism support