Added polymorphic tool and associated rendering code