Changes for Rails 4