Remove TR and NE macros
Add WITH macro