WIP: Add entity API integration for field discovery

what do you mean?