Update for Berkshelf 3