Better status handling