Updates and comments tenant_ofs