Adjustments to move away from singleton pattern to instance