Refactor API to be consistent
0.5.0