Removed use of DOMAIN global