Add more templated