Added the filename to logging calls