Core: add extra follow modes back

Add extra follow modes that where removed by #948