Ported package to 0.9.0