Tentative additions without full test environment.