Refactoring to accomodate easier processing of Fields and typing up field values.