Incorporated validations for TMT