Rolled back some unproper changes in import for fields. Also features was updated