Updates to new Rabbit overhaul