Fix private naming
Add batch checking for memory storage