Added standardization and validation of Tenant IDs.