Merging client and extension