Add appropriate status codes to api v2