Added missing set macros