1 files changed, 15 insertions, 11 deletions
diff --git a/cmd2/plugin.py b/cmd2/plugin.py
index e836b9d1..59169050 100644
--- a/cmd2/plugin.py
+++ b/cmd2/plugin.py
@@ -3,33 +3,37 @@
 """Classes for the cmd2 plugin system"""
 import attr
 
+from .parsing import (
+    Statement,
+)
 
-@attr.s
+
+@attr.s(auto_attribs=True)
 class PostparsingData:
     """Data class containing information passed to postparsing hook methods"""
 
-    stop = attr.ib()
-    statement = attr.ib()
+    stop: bool
+    statement: Statement
 
 
-@attr.s
+@attr.s(auto_attribs=True)
 class PrecommandData:
     """Data class containing information passed to precommand hook methods"""
 
-    statement = attr.ib()
+    statement: Statement
 
 
-@attr.s
+@attr.s(auto_attribs=True)
 class PostcommandData:
     """Data class containing information passed to postcommand hook methods"""
 
-    stop = attr.ib()
-    statement = attr.ib()
+    stop: bool
+    statement: Statement
 
 
-@attr.s
+@attr.s(auto_attribs=True)
 class CommandFinalizationData:
     """Data class containing information passed to command finalization hook methods"""
 
-    stop = attr.ib()
-    statement = attr.ib()
+    stop: bool
+    statement: Statement