Add support for custom fields