Added components to handle Outline
Port of the split tasks