Add ability to specify custom storage class