Updated for berkshelf 3 support