Minor change for non multi tenant environment