Improved status update handling, check better on types.