Updates  to v2.0 compat