Removed hard coded filenames