Simplify data extraction and support more fields