Updated for Rails 3.2.x