Feature/validation