diff --git a/lib/ext/article.rb b/lib/ext/article.rb
index ac3d119..1f5198c 100644
--- a/lib/ext/article.rb
+++ b/lib/ext/article.rb
@@ -5,4 +5,8 @@ class Article
   has_many :states, :through => :article_categorizations, :source => :category, :class_name => State
   has_many :cities, :through => :article_categorizations, :source => :category, :class_name => City
 
+  settings_items :free_conference
+
+  attr_accessible :free_conference
+
 end
diff --git a/lib/ext/environment.rb b/lib/ext/environment.rb
index cb4e043..aae0955 100644
--- a/lib/ext/environment.rb
+++ b/lib/ext/environment.rb
@@ -8,6 +8,7 @@ class Environment
     orig_custom_person_fields.merge!({'orientacao_sexual' => {"active"=>"true", "required"=>"false", "signup"=>"true"}})
     orig_custom_person_fields.merge!({'identidade_genero' => {"active"=>"true", "required"=>"false", "signup"=>"true"}})
     orig_custom_person_fields.merge!({'transgenero' => {"active"=>"true", "required"=>"false", "signup"=>"true"}})
+    orig_custom_person_fields.merge!({'etnia' => {"active"=>"true", "required"=>"false", "signup"=>"true"}})
   end
 
 end
diff --git a/lib/ext/person.rb b/lib/ext/person.rb
index ee5cbdd..9f48a40 100644
--- a/lib/ext/person.rb
+++ b/lib/ext/person.rb
@@ -2,8 +2,8 @@ require_dependency 'person'
 
 class Person
 
-  settings_items :orientacao_sexual, :identidade_genero, :transgenero, :tipo
+  settings_items :orientacao_sexual, :identidade_genero, :transgenero, :tipo, :etnia
 
-  attr_accessible :orientacao_sexual, :identidade_genero, :transgenero, :tipo
+  attr_accessible :orientacao_sexual, :identidade_genero, :transgenero, :tipo, :etnia
 
 end
diff --git a/lib/ext/user.rb b/lib/ext/user.rb
index 1f69e5c..556694e 100644
--- a/lib/ext/user.rb
+++ b/lib/ext/user.rb
@@ -34,6 +34,19 @@ class User
     self.person_data[:tipo] = value
   end
 
+  def etnia
+    self.person.etnia unless self.person.nil?
+  end
+
+  def etnia= value
+    self.person_data[:etnia] = value
+  end
+
+  def city= city
+    city = City.find(city) unless city.kind_of?(City)
+    self.person_data[:region] = city
+  end
+
   def category_ids= categories
     self.person_data[:category_ids] = categories
   end
--
libgit2 0.21.2