Change weld to use new contextId based API