Work on data mapping; add virtual attributes for eligibility criteria