Updated Tasks implementation