Added tree_marks & further PDO integration