added support for custom class and editors