Rewritten string parsing, structure changes