Extract nested fields into new fields

Solution is here
@Badger thanks!