Added Status Code Handling