Improve energy related domains (8)