Enhance communication related domains (2)