Added support for checking for undefined feature