Status checker rework