Additonal templatazation work.