Improve validations structure