Fixed to allow for Entity fields to point to fields of any type