Expanded the API and moved the String Storage