Introduced "parse as string" concept & refactored