Added support for custom field classes