Adapt for TStatus 0.2