Added field line support to auto classifier.
Refactored some more.