Updated Plugin to Class format