Improved status handling