Added support for embedded polymorphic associations