Fix: add status messages