Moved the template instantiation from class to namespace