modularize
Change GenericFieldType to SingleValue