Changes to API.
Cleanup workspace
Changes to API.
Cleanup workspace