null support added