First step of rewriting codes: PDO, addText
Add TODO