Yes, perhaps that would be a better way of going about it. At the same time, I wonder if the emphasis, conceptually, should not be on protecting fundamental (individual) rights and freedoms rather than protecting citizens. My concern is that state surveillance, etc. is generally done in the name of protecting citizens. And, on the other hand, if emergency laws, which bypass parliaments, become increasingly the norm; we can no longer assume the democratic content of law and justice. I suppose that what I am trying to convey is that we should be sensitive to the current context and trends, and ensure that the most basic notions of what democratic rule of law entails are inscribed in the Preamble.