Completely refactored pre-processing options