Improve behavior related domains (1)