WorkPackage mapper changes