Updated for Addon SDK 1.16