Moved wg-support macro to a new file