Added recognition of namespaces and templates/generics