Modify status api to wait