Add support for undefined