Improve parser
Improve parser
Improve parser
Remove obsolete
Remove obsolete
Improve scope