Updated table functionality