Added stuff for filepaths.