added multi tenant ability for utils