Changed defines to reflect the new added brackets.