Hotfix officers & API