Feature/validation improvements