Upgrade for Rails 4 support