Field classes were extracted to separate files