Added some template params.
Merged changes.