Changes on PickingServiceManager