Updated to reflect context change for singleton