Added more status codes. Needs refinement