Added the missing enum macros needed for testing the latest commit.