Reduced imports of JBM in AddonLoader