Added new trap management hardware