Extract more logic into the concern