improve OcrAccount implementation