Changed type of tenantId to prevent constant conversion between String and byte[].