Updated status handling