Addon adapted for 4.3.0