Decoupled the model of Site and more improves in type checks