Updated framework, cms and simple dependencies