Updated key macros