Move custom factors to a new section