Add count capture support