Filldata script moved within helper location