Moved model handling into PDO with atiaa