Updated Site model