Further modeling - improved polymorphism...
Merge beanch