Changed createDomainMap() to make use of new class