Added singlton logic