Optimizations in addon system [deploy snapshot]