Checkpoint: More restructuring to support MySQL