Added map storage/retrieval
Added map storage/retrieval