Global refactor of Fields