Switch to use Boom directly