Added fields annotation