Simplify hasManys to only need EntityField

Change belongsTos to use EntityField for consistency