Updated to latest fuller api