Added back macro's that were taken out by mistake from last commit.