diff --git "a/include/class-wb\\Claim.php" "b/include/class-wb\\Claim.php"
index 9eb9084..4ce1850 100644
--- "a/include/class-wb\\Claim.php"
+++ "b/include/class-wb\\Claim.php"
@@ -1,207 +1,262 @@
 <?php
 # Boz-MW - Another MediaWiki API handler in PHP
-# Copyright (C) 2017, 2018 Valerio Bozzolan
+# Copyright (C) 2017, 2018, 2019 Valerio Bozzolan
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # Wikibase
 namespace wb;
 
 /**
  * A Claim consists of a Snak and Qualifiers.
  *
  * Optionally, it can have qualifiers.
  *
  * @see https://www.wikidata.org/wiki/Wikidata:Glossary#Claim
  */
 class Claim {
 
 	/**
 	 * When a claim has not a main snak, we assume that it has this dummy property.
 	 *
 	 * It's very useful to send claims to be deleted. It works. asd
 	 *
 	 * @see https://phabricator.wikimedia.org/T203572
 	 */
 	const DUMMY_PROPERTY = 'ASD-ASD-ASD';
 
 	/**
 	 * Snak
 	 *
 	 * @var Snak|null
 	 */
 	//var $mainsnak;
 
 	//var $id;
 
-	//var $qualifiers;
+	/**
+	 * Qualifiers collector
+	 *
+	 * @var Snaks
+	 */
+	private $qualifiers;
 
 	/**
 	 * Constructor
 	 *
 	 * @param $mainsnak Snak|null Main snak
 	 */
 	public function __construct( $mainsnak = null ) {
 		// avoid to set a NULL value in order to do not send { 'mainsnak': null } to the API
 		if( $mainsnak ) {
 			$this->setMainsnak( $mainsnak );
 		}
+
+		// initialize snaks collector
+		$this->qualifiers = new Snaks();
 	}
 
 	/**
 	 * Get the mainsnak
 	 *
 	 * @return Snak|null
 	 */
 	public function getMainsnak() {
 		return isset( $this->mainsnak ) ? $this->mainsnak : null;
 	}
 
 	/**
-	 * Get the mainsnak
-	 *
-	 * @return Snak|null
-	 */
-	public function hasQualifiers() {
-		return ! empty( $this->qualifiers );
-	}
-
-	/**
-	 * Get a property. Also a dummy one. asd
+	 * Get a property. Also a dummy one. NOW. asd
 	 *
 	 * @return string
 	 */
 	public function getPropertyAlsoDummy() {
 		$snak = $this->getMainsnak();
 		return $snak ? $snak->getProperty() : self::DUMMY_PROPERTY;
 	}
 
-	/**
-	 * Get the qualifiers
-	 */
-	public function getQualifiers() {
-		return $this->qualifiers;
-	}
-
 	/**
 	 * Set the mainsnak
 	 *
 	 * @param $mainsnak Snak|null
 	 * @return self
 	 */
 	public function setMainsnak( $mainsnak ) {
 		$this->mainsnak = $mainsnak;
 		return $this;
 	}
 
 	/**
-	 * Set the qualifiers
+	 * Set the qualifiers (snaks)
 	 *
 	 * @param $qualifiers
 	 * @return self
 	 */
-	public function setQualifiers( $qualifiers ) {
+	public function setQualifiers( Snaks $qualifiers ) {
 		$this->qualifiers = $qualifiers;
 		return $this;
 	}
 
+	/**
+	 * Add a qualifier (snak)
+	 *
+	 * @param object $qualifier Qualifier (snak)
+	 * @return array
+	 */
+	public function addQualifier( Snak $qualifier ) {
+		$this->qualifiers->add( $qualifier );
+		return $this;
+	}
+
+	/**
+	 * Check if the claim has at least a qualifier
+	 *
+	 * @return boolean
+	 */
+	public function hasQualifiers() {
+		return !$this->qualifiers->isEmpty();
+	}
+
+	/**
+	 * Check if there are qualifiers related to a property
+	 *
+	 * @param $property string e.g. 'P123'
+	 * @return boolean
+	 */
+	public function hasQualifiersInProperty( $property ) {
+		return $this->qualifiers->hasInProperty( $property );
+	}
+
+	/**
+	 * Get all the qualifiers indexed by property (they are snaks)
+	 *
+	 * @return array
+	 */
+	public function getQualifiers() {
+		return $this->qualifiers->getAll();
+	}
+
+	/**
+	 * Get all the qualifiers that are related to a property (they are snaks)
+	 *
+	 * @param $property string e.g. 'P123'
+	 * @return array
+	 */
+	public function getQualifiersInProperty( $property ) {
+		return $this->qualifiers->getInProperty( $property );
+	}
+
 	/**
 	 * Set the claim ID
 	 *
 	 * @param $id string
 	 * @return string
 	 */
 	public function setID( $id ) {
 		$this->id = $id;
 		return $this;
 	}
 
 	/**
 	 * Get the claim ID
 	 *
 	 * @return string
 	 */
 	public function getID() {
 		if( empty( $this->id ) ) {
 			throw new \Exception( 'missing id' );
 		}
 		return $this->id;
 	}
 
 	/**
 	 * Check if this claim is marked for removal
 	 *
 	 * @return array
 	 */
 	public function isMarkedForRemoval() {
 		return isset( $this->remove ) && $this->remove;
 	}
 
 	/**
 	 * Mark this claim as to be remove
 	 *
 	 * @see https://www.wikidata.org/w/api.php?action=help&modules=wbeditentity
 	 * @return self
 	 */
 	public function markForRemoval() {
 		$this->remove = 1;
 		return $this;
 	}
 
 	/**
 	 * Clone this claim and obtain a claim marked for removal
 	 *
 	 * @return self
 	 */
 	public function cloneForRemoval() {
 		return ( new self() )
 			->setID( $this->getID() )
 			->markForRemoval();
 	}
 
 	/**
-	 * Create a claim from raw data
+	 * Create a claim from raw data returned from API responses
 	 *
 	 * @param $data array
 	 * @return self
 	 */
 	public static function createFromData( $data ) {
+
+		// wtf is this shit
 		if( ! isset( $data[ 'mainsnak' ] ) ) {
 			throw new WrongDataException( __CLASS__ );
 		}
+
+		// initialize the claim
 		$claim = new static( Snak::createFromData( $data[ 'mainsnak' ] ) );
+
+		// add qualifiers
 		if( isset( $data[ 'qualifiers' ] ) ) {
-			$claim->setQualifiers( $data[ 'qualifiers' ] );
+			foreach( $data[ 'qualifiers' ] as $property => $qualifier_raws ) {
+				foreach( $qualifier_raws as $qualifier_raw ) {
+					$qualifier = Snak::createFromData( $qualifier_raw );
+					$claim->addQualifier( $qualifier );
+				}
+			}
 		}
+
+		// claim ID
 		if( isset( $data[ 'id' ] ) ) {
 			$claim->setID( $data[ 'id' ] );
 		}
+
 		return $claim;
 	}
 
 	/**
 	 * @override
 	 */
 	public function __toString() {
 		$snak = $this->getMainsnak();
 		if( $snak ) {
 			return $snak->getDataValue();
 		}
 		$id = $this->getID();
 		if( $id && $this->isMarkedForRemoval() ) {
 			return "remove claim id = $id";
 		}
 		throw new \Exception( 'empty claim' );
 	}
 }
diff --git "a/include/class-wb\\Snaks.php" "b/include/class-wb\\Snaks.php"
index b509068..f964dde 100644
--- "a/include/class-wb\\Snaks.php"
+++ "b/include/class-wb\\Snaks.php"
@@ -1,54 +1,102 @@
 <?php
 # Boz-MW - Another MediaWiki API handler in PHP
-# Copyright (C) 2017, 2018 Valerio Bozzolan
+# Copyright (C) 2017, 2018, 2019 Valerio Bozzolan
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # Wikibase
 namespace wb;
 
 /**
- * A Snak collector.
+ * A Snak collector
+ *
+ * @since 2019-07-18
  */
 class Snaks {
 
-	var $snaks = [];
+	/**
+	 * All the Snaks indexed by property
+	 */
+	private $snaks = [];
 
+	/**
+	 * Constructor
+	 *
+	 * @param array $snaks Initial set of snaks
+	 */
 	public function __construct( $snaks = [] ) {
 		foreach( $snaks as $snak ) {
 			$this->add( $snak );
 		}
 	}
 
-	public static function factory( $snaks = [] ) {
-		return new self( $snaks );
-	}
-
+	/**
+	 * Add a Snak
+	 *
+	 * @param object $snak
+	 * @return this
+	 */
 	public function add( Snak $snak ) {
-		$this->snaks[] = $snak;
+
+		// eventually init the property container of snaks
+		$property = $snak->getProperty();
+		if( !isset( $this->snaks[ $property ] ) ) {
+			$this->snaks[ $property ] = [];
+		}
+
+		// append
+		$this->snaks[ $property ][] = $snak;
+
 		return $this;
 	}
 
-	public function getAll() {
-		$properties = [];
-		foreach( $this->snaks as $snak ) {
-			$property = $snak->getProperty();
-			if( ! isset( $properties[ $property ] ) ) {
-				$properties[ $property ] = [];
-			}
-			$properties[ $property ][] = $snak;
+	/**
+	 * Get all the snaks from a certain property
+	 *
+	 * @param string $property Property name e.g. 'P123'
+	 * @return array
+	 */
+	public function getInProperty( $property ) {
+		if( $this->hasInProperty( $property ) ) {
+			return $this->snaks[ $property ];
 		}
-		return $properties;
+		return [];
 	}
+
+	/**
+	 * Check if there are some snaks in this property
+	 */
+	public function hasInProperty( $property ) {
+		return !empty( $this->snaks[ $property ] );
+	}
+
+	/**
+	 * Check if there are not snaks
+	 *
+	 * @return boolean
+	 */
+	public function isEmpty() {
+		return !empty( $this->snaks );
+	}
+
+	/**
+	 * Get all the snaks indexed by property
+	 *
+	 * @return array
+	 */
+	public function getAll() {
+		return $this->snaks;
+	}
+
 }