Improve strategy to merge data