Update module api to be more intuitive
0.0.2