Update the API to be more generic
0.0.8