Added validators/flags for optional/required