added extraction metrics and refactored extraction schema