Damage control, v. 3.1 (refactoring response api and tracker mgmt)