Update data types to mirror Macro Expand project