Added nested fields, but they are buggy