Fix the Builtin plugin to work with new Mahabhuta API