Removing conversion to strings
Fixing null pointers
Clean up imports
Clean up Fields APIs