change forms to use variant types instead of strings for atomic values