WIP: Add entity API integration for field discovery

Would you put in place some kind of checks to make sure both things match?