Changes for recent rule additions