Update for extended TardisAPI