Tidied up DomainExtender. Removed unneccessary class.