Merged files from the old agent