Adding validation base
Mering develop with feature/validation