[TASK] Changed structure to be both compatible to NEOS and CMS