Added some new files for the optimization to work.