Updates to work with official add-on API