Add metrics and fetching