Refactored API
0.3.0