Updated table implementation