SwitchYard: Adjusted to use new requirements