Added 'WDC' postfix to add macro with key, default and comment only