Updated to take into account modifications in KeePassPHP.