Make the fake preprocessing a real one
Add support for term output