OGM-233 - OGM is not polymorphic

Reopening pull request