Add macros for addr and sizeof