Removed ActiveSupport Dependency