Updated to new version of toolbox-base