#22 Improved status service.