move add-on functionality to make include