Added support for wider range of values for fields