Updated wayf methods.