More null support added in M3