diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php
index f57dd1d3..63cbee07 100644
--- a/dibi/drivers/pdo.php
+++ b/dibi/drivers/pdo.php
@@ -417,7 +417,7 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver
 			// PHP < 5.2.3 compatibility
 			// @see: http://php.net/manual/en/pdostatement.getcolumnmeta.php#pdostatement.getcolumnmeta.changelog
 			$row['table'] = isset($row['table']) ? $row['table'] : NULL;
-			
+
 			$res[] = array(
 				'name' => $row['name'],
 				'table' => $row['table'],
diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index e883b315..6f22dcbe 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -17,6 +17,14 @@
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read bool $connected
+ * @property-read mixed $config
+ * @property-read IDibiDriver $driver
+ * @property-read int $affectedRows
+ * @property-read int $insertId
+ * @property IDibiProfiler $profiler
+ * @property-read DibiDatabaseInfo $databaseInfo
  */
 class DibiConnection extends DibiObject
 {
diff --git a/dibi/libs/DibiDataSource.php b/dibi/libs/DibiDataSource.php
index f4193782..3b6b02bb 100644
--- a/dibi/libs/DibiDataSource.php
+++ b/dibi/libs/DibiDataSource.php
@@ -17,6 +17,11 @@
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read DibiConnection $connection
+ * @property-read DibiResult $result
+ * @property-read DibiResultIterator $iterator
+ * @property-read int $totalCount
  */
 class DibiDataSource extends DibiObject implements IDataSource
 {
diff --git a/dibi/libs/DibiDatabaseInfo.php b/dibi/libs/DibiDatabaseInfo.php
index 8e29054d..2c01060a 100644
--- a/dibi/libs/DibiDatabaseInfo.php
+++ b/dibi/libs/DibiDatabaseInfo.php
@@ -17,6 +17,10 @@
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read string $name
+ * @property-read array $tables
+ * @property-read array $tableNames
  */
 class DibiDatabaseInfo extends DibiObject
 {
@@ -128,6 +132,14 @@ class DibiDatabaseInfo extends DibiObject
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read string $name
+ * @property-read bool $view
+ * @property-read array $columns
+ * @property-read array $columnNames
+ * @property-read array $foreignKeys
+ * @property-read array $indexes
+ * @property-read DibiIndexInfo $primaryKey
  */
 class DibiTableInfo extends DibiObject
 {
@@ -327,6 +339,9 @@ class DibiTableInfo extends DibiObject
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read array $columns
+ * @property-read array $columnNames
  */
 class DibiResultInfo extends DibiObject
 {
@@ -428,6 +443,17 @@ class DibiResultInfo extends DibiObject
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read string $name
+ * @property-read string $fullName
+ * @property-read DibiTableInfo $table
+ * @property-read string $type
+ * @property-read mixed $nativeType
+ * @property-read int $size
+ * @property-read bool $unsigned
+ * @property-read bool $nullable
+ * @property-read bool $autoIncrement
+ * @property-read mixed $default
  */
 class DibiColumnInfo extends DibiObject
 {
@@ -539,7 +565,7 @@ class DibiColumnInfo extends DibiObject
 
 
 
-    /**
+	/**
 	 * @return bool
 	 */
 	public function isNullable()
@@ -620,6 +646,9 @@ class DibiColumnInfo extends DibiObject
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
  * @todo
+ *
+ * @property-read string $name
+ * @property-read array $references
  */
 class DibiForeignKeyInfo extends DibiObject
 {
@@ -667,6 +696,11 @@ class DibiForeignKeyInfo extends DibiObject
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read string $name
+ * @property-read array $columns
+ * @property-read bool $unique
+ * @property-read bool $primary
  */
 class DibiIndexInfo extends DibiObject
 {
diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php
index b3269e59..408a20a6 100644
--- a/dibi/libs/DibiFluent.php
+++ b/dibi/libs/DibiFluent.php
@@ -17,6 +17,10 @@
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read string $command
+ * @property-read DibiConnection $connection
+ * @property-read DibiResultIterator $iterator
  */
 class DibiFluent extends DibiObject implements IDataSource
 {
diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php
index d9315cd5..a94b1543 100644
--- a/dibi/libs/DibiResult.php
+++ b/dibi/libs/DibiResult.php
@@ -30,6 +30,13 @@
  *
  * @copyright  Copyright (c) 2005, 2010 David Grudl
  * @package    dibi
+ *
+ * @property-read mixed $resource
+ * @property-read IDibiDriver $driver
+ * @property-read int $rowCount
+ * @property-read DibiResultIterator $iterator
+ * @property string $rowClass
+ * @property-read DibiResultInfo $info
  */
 class DibiResult extends DibiObject implements IDataSource
 {