Update to work with Rails 4