refactor for validation 0.2.0