Updated as part of solution reorg. & security implementations.