Changes to API for version 0.2