Improved String handling