Add support for null Elements