Added missing traps