Added some new trap types.