Fixed storage

Fix CMap class use