Add clear mapping variables before (re)filling