Added support for relative filepaths