Add support for wbcreateclaim