refactor passing data to entry