Removed GBToolbox dependency and updated for GBStorage 2