Fixed issues with the domain and mappings.