Added namespace and aliases to top of class template