WIP: Add entity API integration for field discovery