Updated template manager to allow for extra template locations