Restructured the fields