Added additional toolbox helpers