Merge API changes for chanspy