Refactored to ActiveSupport concern