Refactored the JSON Field parser slightly and cleaned up domain objects.