Adding berkshelf support