Changes to support status message