Refactor for official Fleet API