Added automatic domain configuration