Added filenames and line numbers logging