Dupe improve custom data handling