Updated to latest waddell api