Changed Field and Settings classes