WIP: Add entity API integration for field discovery

Do we check things like 'image' in the field definition and 'imgae' in the discovery options?