Add more flexible template