Updated to latest waddell API