Adding Mapping properties and reflection