Validator changes
Solve Compile problems and merge