Support Detect CMS

	1- Support detect CMS
	2- Refine the system Architecture