Further enhancements in Preprocessing