Updated cms and framework