[#777] Refactor to handle core template changes