--- a/Lib/IMPL/SQL/Schema.pm	Sat Apr 23 23:12:06 2011 +0400
+++ b/Lib/IMPL/SQL/Schema.pm	Thu May 12 08:57:19 2011 +0400
@@ -2,7 +2,9 @@
 package IMPL::SQL::Schema;
 
 use IMPL::_core::version;
-use IMPL::lang;
+
+use IMPL::lang qw(is :declare :constants);
+
 use parent qw(
 	IMPL::Object
 	IMPL::Object::Disposable
@@ -10,7 +12,6 @@
 	IMPL::Object::Clonable
 );
 
-use IMPL::Class::Property;
 use IMPL::Class::Property::Direct;
 
 require IMPL::SQL::Schema::Table;
@@ -18,9 +19,9 @@
 __PACKAGE__->PassThroughArgs;
 
 BEGIN {
-    public _direct property version => prop_get;
-    public _direct property name => prop_get;
-    private _direct property tables => prop_get;
+    public _direct property version => PROP_GET;
+    public _direct property name => PROP_GET;
+    private _direct property tables => PROP_GET;
 }
 
 sub AddTable {
@@ -66,10 +67,6 @@
 	UNIVERSAL::isa($table,'IMPL::SQL::Schema::Table') ? $table : $this->{$tables}{$table};
 }
 
-sub Table {
-	goto &GetTable;
-}
-
 sub GetTable {
 	my ($this,$tableName) = @_;
 	return $this->{$tables}{$tableName};