move addon retrieving logic to addon method