added more template instantiations
start class names with an uppercase letter