Moved message IDs to macros