diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
index e5bbf60a3a99afaf31834fdab52f2c7a2e181d0c..6276577b8c6f42172801ffaa7590ee2643e04d35 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
@@ -9,7 +9,9 @@ export default class Author extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.author)(state, dispatch);
+      Commands.setBlockType(state.config.schema.nodes.author, {
+        class: "author"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
index f09ca8a8553e70de6d86cfe6342efa9602fd5691..ad74a932ee5310ffb8ac744f88dc32115edf98ea 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
@@ -9,10 +9,9 @@ export default class EpigraphPoetry extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.epigraphPoetry)(
-        state,
-        dispatch
-      );
+      Commands.setBlockType(state.config.schema.nodes.epigraphPoetry, {
+        class: "epigraph-poetry"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
index 735e98ada8f307629065bc97f60919b0f661d391..0b800c069e6386d6de6f96b4279e0eabf6c0391d 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
@@ -9,10 +9,9 @@ export default class EpigraphProse extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.epigraphProse)(
-        state,
-        dispatch
-      );
+      Commands.setBlockType(state.config.schema.nodes.epigraphProse, {
+        class: "epigraph-prose"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
index e5932b625e8a5987c328e24fd2c17720481e6d3f..332d816d9aee15c4e1d616d2382d500875954cb1 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
@@ -9,10 +9,9 @@ export default class SubTitle extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.subtitle)(
-        state,
-        dispatch
-      );
+      Commands.setBlockType(state.config.schema.nodes.subtitle, {
+        class: "cst"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
index e61b8665f313518d5a9db82d6cad1b383823445f..469096c151095cef8c20dee2ffd9ebeac9acc39c 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
@@ -9,7 +9,9 @@ export default class Title extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.title)(state, dispatch);
+      Commands.setBlockType(state.config.schema.nodes.title, {
+        class: "title"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
index 6987304d15a9bac667ccb7dfb50fdb47ed366808..d4c87d7f53c796d5f07077a0a40fd555a083e409 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
@@ -9,10 +9,9 @@ class ExtractPoetry extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.extractPoetry)(
-        state,
-        dispatch
-      );
+      Commands.setBlockType(state.config.schema.nodes.extractPoetry, {
+        class: "extract-poetry"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
index 05dd9edad772c15793154a04d45ea091ceea8e49..e887b90542a3012cbf8e269f719a1c119c0a4ed0 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
@@ -9,10 +9,9 @@ class ExtractProse extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.extractProse)(
-        state,
-        dispatch
-      );
+      Commands.setBlockType(state.config.schema.nodes.extractProse, {
+        class: "extract-prose"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
index 1d2206f842f797173b3242137a045dc32500ebaa..0821ef32b4390949cb99a1452a6c43b97d775f1d 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
@@ -9,10 +9,9 @@ class ParagraphContinued extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.paragraphCont)(
-        state,
-        dispatch
-      );
+      Commands.setBlockType(state.config.schema.nodes.paragraphCont, {
+        class: "paragraph-cont"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
index 4d7b2bbed83fb34b2493daf409e9b45c1c83ca3d..e3018a4e2bcf78c83f10d8c8480cdec20345178f 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
@@ -9,10 +9,9 @@ export default class Paragraph extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.paragraph)(
-        state,
-        dispatch
-      );
+      Commands.setBlockType(state.config.schema.nodes.paragraph, {
+        class: "paragraph"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
index 833bb7fc918cc67b11aef1b21f02e661a8274868..3e333e8dd142d1c4906db3e38f43db467a7bfb62 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
@@ -9,10 +9,9 @@ class SourceNote extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      Commands.setBlockType(state.config.schema.nodes.sourceNote)(
-        state,
-        dispatch
-      );
+      Commands.setBlockType(state.config.schema.nodes.sourceNote, {
+        class: "source-note"
+      })(state, dispatch);
     };
   }
 
diff --git a/wax-prosemirror-utilities/src/commands/Commands.js b/wax-prosemirror-utilities/src/commands/Commands.js
index 9e6c94a187849dd56ad9e7a78deb9bbf676eb30b..5668ce7765b4b4a4957ba76b30a6243a640e7d0f 100644
--- a/wax-prosemirror-utilities/src/commands/Commands.js
+++ b/wax-prosemirror-utilities/src/commands/Commands.js
@@ -16,8 +16,8 @@ const setBlockType = (nodeType, attrs = {}) => {
       }
       if (applicable) {
         tr.setBlockType(
-          pos,
-          pos + node.nodeSize,
+          from,
+          to,
           nodeType,
           Object.assign({}, node.attrs, attrs)
         );