added App.FieldExtractor
some refactoring
+some refactoring