Forward ported the Polymorphic Interface to 2.0