Adding criteria block and depending on comm module