Updated to reflect supported fields in demo