Allow addons to be accessed via an order

Change-Id: Ie739310d7bc734dd2d753aa80807f69587a0ad32