OZP-840: Initial cut at newer security API and refactoring of various Interfaces.