Started rewriting table operations