- Made changes to addon to reflect changes made by new arch