Updated mapper to work with dictionary instead of property bag, small fixes still required.