Improves extraction and query algorithms, and returns richer metadata