Removed morphOne and morphMany workaround hack