#396 397 parser change for namespace