Moved some macro defintions