Update to use Polymorphic API