Adding field selection