Use improved option handling
Properly hook addon loading events