Revise RabbitCAP