complete table design update

This is the complete table design for now. Will add modifications later.