Removing string conversion as much as possible
Clean up imports
Improving null pointers checks
Removing Fields.empty() with plain constructor
Clean up Fields APIs