Added WAYF support to the module