Updating to work with tonic v2
Upgrading to work with new tonic api