Resolve domain (24/38)

Resolve domain