Added client and project fields