switched form usign separate dictionary to direct using schema objects