Restructure to avoid overriding String object