Validator and Constraints

already saw this in danila PR correction will be add in next commit