Add more rabbit
More rabbit changes