Added templated class / member function overloading