Adds more advanced pre-processing