Tweaking the addons model and added in start of options library.