Added Map and Walk methods