port to 0.8.x architecture