Added support for ActiveSupport4