Add brace
Add compatibility macros