Support for custom field selector added