Added: While parsing + tests