Added support for rollback of pickups