Add metrics support
temporarily disable overlapping extraction