Updated to support framework v0.0.4