Site model adjustments

The `raise` part is superfluous, yes.