Forgot to add these two in the previous commit
Move template definitions to source file and use explicite template instantiation.