Updated toolbox to package