model factory adjustments for Task