Addon Adaptation to 3.3.5a