Refactor API to match other components, 0.2.0