More regulators definitions fine-tune