Add site events resolve circular dependency issue