adding check for feature set