Added new plain_topo_resolve mode