Updated models with fixed task