improved architecture of Fields