diff --git a/Rewrites.jrag b/Rewrites.jrag
index 9dc1f0df7f5b2238e5a23bd33cc55f9d87d5f1e7..c62fc43785cf39842175819cb838c6b645b39179 100644
--- a/Rewrites.jrag
+++ b/Rewrites.jrag
@@ -227,6 +227,22 @@ aspect MiscUtilities {
 }
 
 aspect RewriteClasses {
+
+	rewrite Declaration {
+		when (isClassDecl())
+			to ClassDeclaration {
+			ClassDeclaration c = new ClassDeclaration();
+			c.setElementList(getElementList());
+			return c;
+		}
+		when (isIndividualDecl())
+			to IndividualDeclaration {
+			IndividualDeclaration c = new IndividualDeclaration();
+			c.setElementList(getElementList());
+			return c;
+		}
+	}
+
     rewrite OwlClass {
 		when (isTopLevel())
 			to OwlClassDecl {