Removing conversion to strings
Clean up imports
Added Eager creation of XServerSingleton
Clean up Fields APIs