YH-219: Removed short_domain from tools