Replacing ApiError with ApiStatus