Add debugging info
Move data into explicit named union