Decoupling Site model and more improves into type checks