New feature: More master rules