upgrading to 0.9.x compatibility