Update for Rails 4 compatibility