Updated files to include traps.