Adding support to fetch tenant if not present