0.0.1, improved API