Bugfix/multipart storage class