Implement unsafe trait support (continued)

Implement unsafe trait support (continued) #385