update switchyard application for Use Case 2 and 3