Add structure for future coding