Removed dependency on ActiveSupport