Minor changes to Storage module

Related to Issue #49