Modifications made to scheme eligibility prototype