Update to use common-api for API abstraction