Update pushUid to return the passed method and popUid to return the previous method
Update version