Updated for Rails 4 compatibility