Trying to add support to edge version(2.0.0.beta)