added non-native fields support