Add count fields