Updated to use new Swiftclient class