Added minimal version of automated count fields.