Updated Plugin with default values