FieldHandler / FieldRetriever refactor

Uncategorized