Refactored some of the template path methods