Added support for integer and boolean fields.