Update for Rails 4.1