Added Map and others