Done changing classes to make use of static plugin