More WAYF reference here that should be revisited.