Add fields / Count fields