Improve EQ related domains (3)