API Changes, making swfClient optional