Templatization

What about possible other locations that could be more generic?