Add support for additional field types