Updates to work with rabbit.app.serverbase