Merge "Added extra field structure." into studio-master-dev