[Feature] Start to merge claim submit function