Added support for multiple feature-types