added support for multiple feature types