enhancing noCMS option and adding cms option which don't work yet