Added component blockType + some bug fixes related to templateString changes