Removed undefined and null support.