Add support for field types