Update for new webyast architecture