Draft operational policy rework