Properly include templates