Modernised for the new GBStorage