More model support for endless tasks #54