Hotfix/1 impl pdo