Add support for custom field