Adding some trait support.