I have blackberry, raspberry for vines on my MF map in 22. Also have peach, apple,plum, banana, coconut and few more trees on that map as well. Along with pistachio and almond trees.
If you want and are interested I can let you know which maps I got them from in 22 and maybe you can port them in to 25. Or I can share my map with you and you can do what you want. Let me know.