Bug fix and further enhancements to Storage Module