Manage Correctly Site generation