Updating to work with Rails 4.0.11