Improve battery related domains (1)