Resolve domain in a separate step