Add namespace DocBlock context

So they can be expanded correctly
Refactor variables and better namespace support
More fixes