Better handling of status change (transition)