__enabled__ renamed to __validate__
refactoring