added nested fields back