Updates for Berkshelf 3