Adding more robust features for puppet update