Updated for Rails 4.0