Add support for advanced field lookups