optimize site import
Correct recursive import when importing client