Use the new ender API