Improved Addon API