Added more rule types