Add Data macros to simplify structures.