Added more template selecting