Added client and task models