Add initial handler support and change some assumptions about task indexes.