WIP: Add entity API integration for field discovery

Can we keep this?