Updated property mapping method.