Added support for feature layers.