Made plugin OOP