Some work on making the API less dependent on the base mod (not a good thing!)