Adding more to namespace parsing.