improved energy/type annotation