adding support for other feature types