Update API to avoid passing `self` all the time.
Version 0.1.1