Working on Jet addon