Remove IP_ADDR_X constant
Add macros to switch context