Added missing files from the initial trace integration