Bringing nats gem up-to-speed as well