config/data.rb and associated changes