Now handling polymorphism in the proto-DI