* Updated status code handling