Added subdomain functionality
Merge