Enhancement: claim domain