Added table implementation