Update include method and templates