Updates to reflect new Rabbit syntax