Adding odenergy support