Upgrade to support Rails 4