Added TAEcon support