APY-121 : Polymorphic support for models