added Basic Mapping