Added Subfield and refactored lookups