Moved templated function implementations into inl file