Improve get_status