Improvements to Yampa example