Updated to work with latest switchyard