modifications to fit with core v1.0.6