Updated for NBUCore 1.9.0