diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 1c3ae1324..4a8defd15 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,6 +1,8 @@
 # GoodData Ruby SDK Changelog
 
 ## 0.6.6
+- Fixed the scaffolding templates to take advantage of new syntax (missing references in dataset refs) 
+- Fixing inclusion of extensions when using CLI
 
 ## 0.6.5
 - Mixins
diff --git a/lib/gooddata/cli/shared.rb b/lib/gooddata/cli/shared.rb
index fa22b7d64..8b0efdec5 100644
--- a/lib/gooddata/cli/shared.rb
+++ b/lib/gooddata/cli/shared.rb
@@ -4,6 +4,7 @@
 
 require_relative '../version'
 require_relative '../core/core'
+require_relative '../extensions/extensions'
 
 include GLI::App
 
diff --git a/lib/templates/project/model/model.rb.erb b/lib/templates/project/model/model.rb.erb
index 3c61c2681..42bebcabc 100644
--- a/lib/templates/project/model/model.rb.erb
+++ b/lib/templates/project/model/model.rb.erb
@@ -14,8 +14,8 @@ GoodData::Model::ProjectBuilder.create("Test project") do |p|
     p.add_dataset("commits") do |d|
         d.add_fact("lines_changed")
         d.add_date("committed_on", :dataset => "committed_on")
-        d.add_reference("dev_id", :dataset => 'devs', :reference => 'dev_id')
-        d.add_reference("repo_id", :dataset => 'repos', :reference => 'repo_id')
+        d.add_reference("dev_id", :dataset => 'devs')
+        d.add_reference("repo_id", :dataset => 'repos')
     end
 
 end
\ No newline at end of file