changes for storage implementation