Revised table functionality