Change the way fields are built