Changed OPDAnalysis from a static class to an enum singleton.