Change set TenantId access property in Message class to private