Added more trait support