Optimizations and Dependency file

Optimized addon through use of new included dependency