Track analyzation fields
Track requested fields. still need to refactor to write tests