Added updated cluster rewrite rules for 5.4