Add support for Berkshelf 3