Add better structure for including template