-- Added code to support multi domain, GEP-50