Enhanced Storage fixes #2