Re-added support for BerryBush and NetherBerryBush