Move Addon static methods to bottom