Updated to work with the new BeetleContext.