Look for core addons too