Add validation at creation and at generation