Added berkshelf support