Moved map generation logic to CelluarMap class