Change all mapings to non-recursive