Updated table design