[REF] Add validation and modify env