Adding support for Rails 4