Started rewriting table operations
Continue rewriting $ extraction method