More updates to support code template content assist