Better API
Prep for version 0.4.0