Updated with table design