Added support for feature specs