add @NonTenant annotation to prevent multi tenant functionality when needed.