Added domain, uuid and language support