Make sure tenant_id is String(255) across the board