update scheme to include validation