Updated for namespaced generics

namespaced