Modified in order to comply with the new class structure of CloudTask