[NUCODF-56] Adopt Table/Column structure for easier coding