Added polymorphic support.