Support for core framework v0.0.5