Added JOP/COP support
TODO: Testing + UI