Moving to single instance
Reverting to monolithic due to bug
Moving to 1.1.8