Added some stuff to the field wrapper