Adding Smart Rearranging Template Provider