Added File: trigger option, removed legacy code