Updated to reflect property mapping changes.