; and (B) has not entered into a contract, agreement, or other arrangement for such individual to act as a caregiver for that veteran unless such individual is a family member of the veteran or is furnishing caregiver services through a medical foster home. . (b) Deadline for improved administration The Secretary of Veterans Affairs shall ensure that the Veteran-Directed Care program and the Homemaker and Home Health Aide program are administered through each medical center of the Department of Veterans Affairs in accordance with section 1720L of title 38, United States Code (as added by subsection (a)), by not later than two years after the date of the enactment of this Act. (c) Administration of Veteran-Directed Care program (1) Procedures (A) The Secretary shall establish procedures to— (i) identify the staffing needs for the Veteran-Directed Care program of the Department of Veterans Affairs under such section (as added by subsection (a)); and (ii) define the roles and responsibilities for personnel of the Department responsible for the administration of such program, including such personnel employed at the national, Veterans Integrated Service Network, or medical facility level. (B) The responsibilities described in clause (ii) of subparagraph (A) shall include responsibilities for engagement with— (i) veterans participating in such program; (ii) veterans interested in participating in such program; and (iii) providers described in section 1720L(b)(2) (as added by subsection (a)). (2) Staffing model; report Not later than two years after enactment of this Act, the Secretary of Veterans Affairs shall— (A) establish a staffing model for the administration of such program at each medical facility of the Department of Veterans Affairs; and (B) submit to the Committees on Veterans’ Affairs of the House of Representatives and the Senate a report containing the following: (i) A description of— (I) the staffing model described in subparagraph (A)